Fixed regex problems.