Fixed to build under chipper/single-file