diff --git a/Makefile b/Makefile
index 7b43bc4ff..52958ee08 100644
--- a/Makefile
+++ b/Makefile
@@ -114,8 +114,8 @@ endif
 #  for runtime path (i.e.: the second line in $(NIMBLE_DIR)/pkgs/*/*.nimble-link)
 $(NIMBLE_DIR): | $(NIM_BINARY)
 	mkdir -p $(NIMBLE_DIR)/pkgs
-	NIMBLE_DIR="$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \
-		git submodule foreach --quiet 'bash $(CURDIR)/scripts/create_nimble_link.sh'
+	NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \
+		git submodule foreach --quiet 'bash $(CURDIR)/scripts/create_nimble_link.sh "$$sm_path"'
 
 # symlink
 nimbus.nims:
diff --git a/scripts/create_nimble_link.sh b/scripts/create_nimble_link.sh
index 96360ea18..e0dd313cf 100644
--- a/scripts/create_nimble_link.sh
+++ b/scripts/create_nimble_link.sh
@@ -1,11 +1,13 @@
 set -u
 
+module_name="${1#*/}"
+
 if [ `ls -1 *.nimble 2>/dev/null | wc -l ` -gt 0 ]; then
-  mkdir -p "$toplevel/${NIMBLE_DIR}/pkgs/${sm_path#*/}-#head"
+  mkdir -p "${NIMBLE_DIR}/pkgs/${module_name}-#head"
 	PKG_DIR="$(${PWD_CMD})"
 	if [ -d src ]; then
     PKG_DIR="${PKG_DIR}/src"
   fi
-	echo -e "${PKG_DIR}\n${PKG_DIR}" > "$toplevel/${NIMBLE_DIR}/pkgs/${sm_path#*/}-#head/${sm_path#*/}.nimble-link"
+	echo -e "${PKG_DIR}\n${PKG_DIR}" > "${NIMBLE_DIR}/pkgs/${module_name}-#head/${module_name}.nimble-link"
 fi
 
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index 187a670d9..9d0326aad 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit 187a670d9792a3c20c2db1753e9c93635594e048
+Subproject commit 9d0326aad41c0efdc83b5612e76f7a493d82f27d