See https://github.com/openmoq/moqx/pull/303
See openmoq/moqx#303