fixing regex routine. ni returning all matches again