Fixing model issue