Master shutdown unintended pid removal fixed