less 458

Also fix the test, which has side effects.