Ok, looks like this will fix shutdown.