DEVKIT-556 Fixed