[OE-3301] pretty fundamental bugfix :D