Fixing issue with removed class Color