implemented timeout fix that's in the PR queue for the main project