UPD: small merge fix