Fix regexp to be less greedy