Fixed issue with regex being too greedy