v2.1.2 fixup 1aa8cf9 Regex for hyphen vars