Updated after IJ upgrade.