Fix regex to non greedy