fix for bug that @problem mentioned on worklist