fix swaps