Fix timeout working