Fix the @model breakage.
Move the missing logic.