Better cleartimeout logic for bump