Fix RegExp issue