Fixing issue #7 : change the color only when required