KRACOEUS-8231: removing reflection
Merge pull request #1012 from leoherbie/KRACOEUS-8231_2

KRACOEUS-8231: removing reflection