Bug fixing in PersistentModel