Fixing ICAT issue on dev.