Fixing model 2 bug