Fixed routing

and a silly model error