fix -optimized code
fix set highlight