fix issue with timeout