NPC ignores extra keys after close

Fix #1617