Thanks for providing the patch Vladimir! @ipalov Can this patch be accepted?
@ipavlov Does this patch do the right thing?