Fix task model for fit conventions