Unbreak assignmentOptimization