#3124 avoid RegEX