Fixup, use correct regex