Typo fix + regex fix