Hi Johan/Fredric, 

This patch fixes CancelCall .

Let me know if anything needs to be changed.  

-Alok.