fixing timeout issue