fixed models.. again