Fixing a color override bug