Final fixes for #45
Clear the previous timeout