Fixed issue in my regex where it was being too greedy.