Fixes https://github.com/Webconverger/webc/issues/168
Tidy up!