UPD: fixing #469