fixed model references