Fixes swap methods