fixing regex problems