Ticket #46 - quick fix