Fixed matcher that was too greedy.