Fix issue when the model have an custom id