Andrei:

Please try the patch I have attached to this ticket and see if it
resolves your problems.

Thanks.

Jeffrey Altman