Fixed for direct NPM use