5.8 fixed for reals this time.

when doesn't work on 5.8 either, which is puzzling.