[OE-2578] bugfix related to previous commit