UPD: Fixing bug