Fixed cancelling and refreshing