replace @@ with @