UPD: fix issue from 0.5.1 prepare