Fixes https://github.com/Webconverger/webc/issues/139