use a better regex