Fixed shutdown hang -- possibly