workaround for DEVKIT-351