diff --git a/scald_iframe.module b/scald_iframe.module
index 9a67773..303e64e 100755
--- a/scald_iframe.module
+++ b/scald_iframe.module
@@ -44,7 +44,7 @@ function scald_iframe_scald_add_form_fill(&$atom, $form, $form_state) {
   // Therefore we prefill the URL field for all enabled languages.
   foreach (language_list() as $lang => $language) {
     if ($language->enabled == TRUE) {
-      $atom->scald_url[$lang][0]['value'] = $form_state['values']['url'];
+      $atom->data[$lang] = $form_state['values']['url'];
     }
   }
 }
@@ -63,9 +63,10 @@ function scald_iframe_scald_fetch($atom, $type) {
   }
 
   // Iframe URL
-  $url = field_get_items('scald_atom', $atom, 'scald_url');
+  global $language;
+  $url = $atom->data[$language->language];
   if (!empty($url)) {
-    $atom->iframe_url = $url[0]['value'];
+    $atom->iframe_url = $url;
   }
 
   // Iframe width