Bugfix in ORM