changed client timeout behaviour