Change non greedy to greedy