fixed duplicated stop