DEVIDM-109: Replaced faulty regex with string comparison