fix for the ticket 2136

This is the fix for the ticket 2136 :)