[OE-3289] fixed bugs in this, but it's being bumped from the 1.4 release anyway so not a priority anymore