Code

Applied patch from Ticket 112.