Bug fix for Emergency Stop