diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index e18fbae05..5249a07e2 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -35,7 +35,12 @@ class ShixunsController < ApplicationController
           s = Trustie::Gitlab::Sync.new
           s.sync_user(User.current)
         end
-        gshixun = g.fork(@shixun.gpid, User.current.gid)
+        if @shixun.gpid
+          gshixun = g.project(@shixun.gpid)
+        else
+          gshixun = g.fork(@shixun.gpid, User.current.gid)
+        end
+
         if gshixun.id
           myshixun = copy_myshixun(@shixun, gshixun)
           challenges = @shixun.challenges