Corrected timeout behaviour