More appropriate stop method