bug fix and temporary solution for clear all timeout