Bug fix: missing required indirection on stop