+ fix for shutdown