Fix Regexp, Use path_helper Output