New version of swnp shutdown fix.