Fixed timout bug