Added hack to squelch Hachoir :(