Fix timeout feature