fix for DEVKIT-264