Fix timeout issue