Fixed: a BC break and used regex instead of multiple string operations