fixed model issues