Replace the regular expression to be more like the IEE WOWMOM spec