UPD: fix #605