Swap states early in masquerade process (bug #1987)