Better stopper

Backwards compatible fix for issue #8