modify syntax; fig bug with return of match object rather than string