two hours bug fix