change a regex to prevent overmatching