New attempt for fixing NPM