Fix for Ticket #854