bug fix (timeouts issue)