Optimization not to re-set current color