bugfixed for regexp, issue WPN-XM/WPN-XM#161