proper fix for the swap world bug