Fix orm mapping