Fix to the ticket #133