fixing timeout?