Fix cancelling ongoing requests