https://github.com/Webconverger/webc/issues/199 fixed