diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j
index 825f1c311..84ab43b4b 100644
--- a/AppKit/Cib/CPCib.j
+++ b/AppKit/Cib/CPCib.j
@@ -198,24 +198,22 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 var CPCibDataFileKey = @"CPCibDataFileKey",
     CPCibBundleIdentifierKey = @"CPCibBundleIdentifierKey";
-    
+
 @implementation CPCib (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     var base64 = [aCoder decodeObjectForKey:CPCibDataFileKey];
-    var rawString = CFData.decodeBase64ToString(base64, NO);
-    _data = [CPData dataWithRawString:rawString];
-    
-    return self
+    _data = [CPData dataWithBase64:base64];
+
+    return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    var base64 = CFData.encodeBase64String([_data rawString]);
-    [aCoder encodeObject:base64 forKey:CPCibDataFileKey];
+    [aCoder encodeObject:[_data base64] forKey:CPCibDataFileKey];
 }
 
 @end