Fixes case 10335
Merge branch 'master' of github.com:Praqma/cool