Fix greedy regex