fixed issue with timeout setting not being cancelled