Fix for Ticket 846