Fix the color issue which was in fact color wrap around

see title