Truly fixed matthew-dean/Crunch#81

No more side-effects. It just works!