TRUNK-3738 Fixed stopping module