Fix issue with assigning belongs_to record back to has_many record