diff --git a/mps/example/scheme/scheme-advanced.c b/mps/example/scheme/scheme-advanced.c
index 2d61189970d..d4b85c186fe 100644
--- a/mps/example/scheme/scheme-advanced.c
+++ b/mps/example/scheme/scheme-advanced.c
@@ -1443,7 +1443,8 @@ static obj_t eval(obj_t env, obj_t op_env, obj_t exp)
     if(TYPE(exp) == TYPE_INTEGER ||
        (TYPE(exp) == TYPE_SPECIAL && exp != obj_empty) ||
        TYPE(exp) == TYPE_STRING ||
-       TYPE(exp) == TYPE_CHARACTER)
+       TYPE(exp) == TYPE_CHARACTER ||
+       TYPE(exp) == TYPE_OPERATOR)
       return exp;
   
     /* symbol lookup */
@@ -2409,11 +2410,23 @@ static obj_t entry_procedurep(obj_t env, obj_t op_env, obj_t operator, obj_t ope
  */
 static obj_t entry_apply(obj_t env, obj_t op_env, obj_t operator, obj_t operands)
 {
-  obj_t proc, args;
+  obj_t proc, args, qargs = obj_empty, end = NULL, quote;
   eval_args(operator->operator.name, env, op_env, operands, 2, &proc, &args);
   unless(TYPE(proc) == TYPE_OPERATOR)
     error("%s: first argument must be a procedure", operator->operator.name);
-  return (*proc->operator.entry)(env, op_env, operator, args);
+  quote = make_operator("quote", entry_quote, obj_empty, obj_empty, obj_empty, obj_empty);
+  while(args != obj_empty) {
+    obj_t a;
+    assert(TYPE(args) == TYPE_PAIR);
+    a = make_pair(make_pair(quote, make_pair(CAR(args), obj_empty)), obj_empty);
+    if(end != NULL)
+      CDR(end) = a;
+    else
+      qargs = a;
+    end = a;
+    args = CDR(args);
+  }
+  return (*proc->operator.entry)(env, op_env, proc, qargs);
 }