bug fix: regexp fix to match greedy