Fix Swap variant