Fixed Ticket #383