diff --git a/Headers/Foundation/NSUbiquitousKeyValueStore.h b/Headers/Foundation/NSUbiquitousKeyValueStore.h
index e83e1290c..03630150e 100644
--- a/Headers/Foundation/NSUbiquitousKeyValueStore.h
+++ b/Headers/Foundation/NSUbiquitousKeyValueStore.h
@@ -43,7 +43,7 @@ extern "C" {
 @interface NSUbiquitousKeyValueStore : NSObject
 
 // Getting the Shared Instance
-- (NSUbiquitousKeyValueStore *) defaultStore;
++ (NSUbiquitousKeyValueStore *) defaultStore;
   
 // Getting Values
 // Returns the array associated with the specified key.
diff --git a/Source/NSUbiquitousKeyValueStore.m b/Source/NSUbiquitousKeyValueStore.m
index a88482a6c..ea621b08d 100644
--- a/Source/NSUbiquitousKeyValueStore.m
+++ b/Source/NSUbiquitousKeyValueStore.m
@@ -34,7 +34,7 @@
 #import <Foundation/NSData.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSUserDefaults.h> 
 
 static NSUbiquitousKeyValueStore *_sharedUbiquitousKeyValueStore = nil;
 
@@ -47,13 +47,17 @@ static NSUbiquitousKeyValueStore *_sharedUbiquitousKeyValueStore = nil;
   return nil;
 }
 
-- (NSUbiquitousKeyValueStore *) defaultStore
++ (NSUbiquitousKeyValueStore *) defaultStore
 {
   if(_sharedUbiquitousKeyValueStore == nil)
     {
       NSString *storeClassName = [[NSUserDefaults standardUserDefaults]
 				   stringForKey: @"GSUbiquitousKeyValueStoreClass"];
       Class klass = NSClassFromString(storeClassName);
+      if(klass == NULL)
+	{
+	  klass = NSClassFromString(@"GSSimpleUbiquitousKeyValueStore"); 
+	}
       _sharedUbiquitousKeyValueStore = [[klass alloc] init];
       if(_sharedUbiquitousKeyValueStore == nil)
 	{