fix swap to speed up