Fix color problem in 2.3