Fix hardcoded options