Bug fixing in the ORM.