fixed wron swatch a vars