Fix DEVKIT-802