Fixed swapping and changing positions