fix regexp logic, only 2 runs of each