Fixed model issue