Attempt to fix arecarn/crunch #32