[OEM-224] bugfix