Fixed regex to respect string boundaries