patch was applied from Vadim Chekry(vchekrii), but check is not finished