UPD: merge fix