fixed ORM issue