Fixed handling of color