Need to update this. The regex should match the one on line 459