Emergency stop
bugfix
Test