Fix regression from #2366199
Merge branch 'master' of github.com:andreyks/csua