This is a BC issue following #162. Maybe the regex can be fixed, or maye a different approach is needed.