Fix bundling, closes #82