swaping fix