model associations fix