Fix swatch bug