Fixed regexes not parsing correctly