sync with upstream.
fix colouring issue.