Index: lams_build/conf/whiteboard/src/js/main.js
===================================================================
diff -u -r94f1c0e87aab7850e19177a945ba8451138c62a0 -r709049f023d1033d4ef6ec198b08c4e2f94e421a
--- lams_build/conf/whiteboard/src/js/main.js	(.../main.js)	(revision 94f1c0e87aab7850e19177a945ba8451138c62a0)
+++ lams_build/conf/whiteboard/src/js/main.js	(.../main.js)	(revision 709049f023d1033d4ef6ec198b08c4e2f94e421a)
@@ -171,19 +171,16 @@
         // request whiteboard from server
         $.get(subdir + "/api/loadwhiteboard", { wid: whiteboardId, at: accessToken }).done(
             function (data) {
-				// modified for LAMS, allow cloning whiteboard even when it is not empty
-				// also force original data to be drawn first
-                if (copyfromwid) {
-                    //Copy from witheboard if current is empty and get parameter is given
+				// modified for LAMS, force original data to be drawn and saved first
+                if (copyfromwid && data.length == 0) {
+                    // Copy from witheboard if current is empty and get parameter is given
                     $.get(subdir + "/api/loadwhiteboard", {
                         wid: copyfromwid,
                         at: accessToken,
                     }).done(function (originalData) {
-						// make sure all images are in the background, otherwise they obscure learners' drawings
-						originalData.forEach((drawItem) => {drawItem.draw = 0});
 						console.log(originalData);
 						console.log(data);
-                        whiteboard.loadData(originalData);
+						whiteboard.loadJsonData(originalData);
 						whiteboard.loadData(data);
                     });
                 } else {