further fix on model associations