Fix borked ported CASL patch
Merge pull request #155 from dmcdougall/fix-casl

Fix borked ported CASL patch