Regex fix via Wolfboss