Fixes arachnys/cabot#8