[Final?] version of kb1's "wiggle hack"