Fixed oversight in NPN handling

Fixes #74