fixing model associations