0024: improved braking

fixes #119