Fixed issue with Color Legend