#IGH-7 Fixed Critical Exception add tag XXXXX