fix for the ticket 2136