Crash fix when restarting Manager