Fix for ticket 1469