Fix for Ticket #1469