And another shutdown fix