diff --git a/openphoto/api_album.py b/openphoto/api_album.py
index e997b65..cda3687 100644
--- a/openphoto/api_album.py
+++ b/openphoto/api_album.py
@@ -1,4 +1,4 @@
-from errors import *
+<<from errors import *
 from objects import Album
 
 class ApiAlbums:
@@ -39,10 +39,7 @@ class ApiAlbum:
         if not isinstance(album, Album):
             album = Album(self._client, {"id": album})
         album.update(**kwds)
-
-        # Don't return the album, since the API currently doesn't give us the modified album
-        # TODO: Uncomment the following once frontend issue #937 is resolved
-#        return album
+        return album
 
     def view(self, album, **kwds):
         """ 
diff --git a/openphoto/objects.py b/openphoto/objects.py
index 965df9a..43c87fe 100644
--- a/openphoto/objects.py
+++ b/openphoto/objects.py
@@ -142,14 +142,8 @@ class Album(OpenPhotoObject):
         """ Update this album with the specified parameters """
         new_dict = self._openphoto.post("/album/%s/update.json" % self.id, 
                                         **kwds)["result"]
-
-        # Since the API doesn't give us the modified album, we need to
-        # update our fields based on the kwds that were sent
-        self._set_fields(kwds)
-
-        # Replace the above line with the below once frontend issue #937 is resolved
-#        self._set_fields(new_dict)
-#        self._update_fields_with_objects()
+        self._replace_fields(new_dict)
+        self._update_fields_with_objects()
         
     def view(self, **kwds):
         """