Support for custom variable regex fixed