Fixed initial color issue