fix swap type
Merge pull request #3008 from Ced2911/swap_fixes

fix swap type