Fix for OLD ORM