Fix DEVKIT-640