+ bugfix for shutdown