bug fix, removed 2 min timeout