Hotfix to manage selfStop message