Regex tweak to include o limits