fixed swapping stupidty