Fix swap action