Pseudo fix for the @@ issue