attempt at fixing timeout bug