Fix model behavior