Fixed wipe (includes regression test). #1421