Fix timeout problem