Fix color swapping on #18