--- rpl/modules/motif/XtAddCallback.rplc	2017/07/22 11:29:49	1.5
+++ rpl/modules/motif/XtAddCallback.rplc	2017/07/30 21:59:40	1.6
@@ -55,10 +55,10 @@ declareExternalFunction(XtAddCallback)
 			sCallback = allocate(size(sXtCallback));
 			sCallback->status = procStatus(rpl_arguments);
 			sCallback->callback = callbackProc;
-			sCallback->widget = target((Widget *) objectContainer(widget));
-			objectContainer(callbackObject) = sCallback;
+			sCallback->widget = target(objectContainer(Widget, widget));
+			objectOf(callbackObject) = sCallback;
 
-			XtAddCallback(target((Widget *) objectContainer(widget)),
+			XtAddCallback(target(objectContainer(Widget, widget)),
 					callback, rplCallback, (XtPointer) sCallback);
 
 			tmp = allocate(size(daisyChain));