Fixed swap method

Everything is running as desired!