Fix for clearing out old model when id has changed