DEVKIT-731 fixed