Model relationship fix