DEVKIT-727 Fixed