update Regexp to fix #2