Fixing that the models get updated correctly