Bug fix for Emergency Stop

Yay! after half an hour it worked to recreate the master branch with the right settings :-)