Fix for Ticket #916