Another model fix
Template wars #2