Fixed Color problem