Added Fix for Greedy RegExp