fixed models issues