Fixing some regexp