Fix model issue