#329 Correction for models with id generator