bugfix/DEVKIT-1161 Programatically solve parsing issue