fixing calls to ORM