third try on issue #1375 (thanks @azrafe7 for regex)