These magic numbers should have been a big alarm, in retrospect (fixes bug; see new test)