diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index bfea754..6bfd81b 100644
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -75,7 +75,12 @@ class data_field_file extends data_field_base {
         $options->itemid    = $itemid;
         $options->accepted_types = '*';
         $options->return_types = FILE_INTERNAL;
-        $options->context = $PAGE->context;
+        $options->context = new stdClass();
+        $options->context->id = $PAGE->context->id;
+        $options->context->contextlevel = $PAGE->context->contextlevel;
+        $options->context->instanceid = $PAGE->context->instanceid;
+        $options->context->path = $PAGE->context->path;
+        $options->context->depth = $PAGE->context->depth;
 
         $fp = new file_picker($options);
         // print out file picker
diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index 269e916..af24349 100644
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -77,7 +77,13 @@ class data_field_picture extends data_field_base {
         $options->itemid    = $itemid;
         $options->accepted_types = array('image');
         $options->return_types = FILE_INTERNAL;
-        $options->context = $PAGE->context;
+        $options->context = new stdClass();
+        $options->context->id = $PAGE->context->id;
+        $options->context->contextlevel = $PAGE->context->contextlevel;
+        $options->context->instanceid = $PAGE->context->instanceid;
+        $options->context->path = $PAGE->context->path;
+        $options->context->depth = $PAGE->context->depth;
+
         if (!empty($file)) {
             $options->filename = $file->get_filename();
             $options->filepath = '/';