Ihor,

Attached is a patch to fix the problem that Benjamin has encountered.

Best regards,
Leo