Shutdown timeout fix