Modify Optimization.
Fix a bug.