Well this seems to be working
Clare case fix

Wot fix
Why do it even care
Remove header
Merge pull request #817 from mannol1/master

Fixed cancel and added handling of the glare case