[OEM-109] bugfix