Fix DEVKIT-801