Fixes W3CBrasil/OD4D#27