diff --git a/source/org/jivesoftware/smack/Roster.java b/source/org/jivesoftware/smack/Roster.java
index eb81024c2..d53570353 100644
--- a/source/org/jivesoftware/smack/Roster.java
+++ b/source/org/jivesoftware/smack/Roster.java
@@ -768,9 +768,9 @@ public class Roster {
             }
 
             // Mark the roster as initialized.
-            synchronized (this) {
+            synchronized (Roster.this) {
                 rosterInitialized = true;
-                notifyAll();
+                Roster.this.notifyAll();
             }
 
             // Fire event for roster listeners.