Fix for model association