Shutdown fix