models associations fixed