Fix for the ticket 1469