fix double stopping