ORM Bug fix