NIBG-1429b: changed the code to support I tag without having to split on underline