Changed timeout behaviour