Fixing multiple has_many issue