fix swap dessign (2)