orm mapping fixed