ENTMQ-581 - a better fix, that don't interfere with regular stops