[OE-3616] fixed with a horrible hack in the core :/