Issue 641

Fixes #641 
Nope. I have changed it to use `!!`.