Swapping in place with an annoying flicker