Fix bug where NSD doesn't start on first run