A lot of people have had issues with the swap, and we intend to fix it in a future patch, but thank you nonetheless for commenting and giving feedback! It is incredibly appreciated!