Fixing colors, see #29