fixed swatch bug