Fix for Ticket #1469
Fix for Ticket #1469
Fix for ticket 1469