Fix gh-22 and fix gh-23: Update npm