Fix for generating correct colors