diff --git a/Facepunch.Steamworks/Client/Achievements.cs b/Facepunch.Steamworks/Client/Achievements.cs
index a661f13..09e489d 100644
--- a/Facepunch.Steamworks/Client/Achievements.cs
+++ b/Facepunch.Steamworks/Client/Achievements.cs
@@ -50,14 +50,10 @@ public Achievement Find( string identifier )
         /// </summary>
         public bool Trigger( string identifier, bool apply = true )
         {
-            var r = client.native.userstats.SetAchievement( identifier );
+            var a = Find( identifier );
+            if ( a == null ) return false;
 
-            if ( apply )
-            {
-                client.Stats.StoreStats();
-            }
-
-            return r;
+            return a.Trigger( apply );
         }
 
         /// <summary>
@@ -159,6 +155,9 @@ public Achievement( Client client, int index )
         /// </summary>
         public bool Trigger( bool apply = true )
         {
+            if ( State )
+                return false;
+
             State = true;
             UnlockTime = DateTime.Now;