diff --git a/build-installer.sh b/build-installer.sh
index e8152fd..6618679 100755
--- a/build-installer.sh
+++ b/build-installer.sh
@@ -102,12 +102,13 @@ get_sources() {
   mkdir -p "${DIR_REPO}"
   pushd "${DIR_REPO}"
 
+  # TODO: re-investigate and optimize this
   git clone --depth 1 "${gitrepo}" .
   git fetch origin --depth "${GIT_FETCHDEPTH}" "${gitref}"
-  git -c advice.detachedHead=false checkout --force "${gitref}"
   git ls-remote --tags --sort=version:refname 2>&- \
     | awk "END{printf \"+%s:%s\\n\",\$2,\$2}" \
     | git fetch origin --depth="${GIT_FETCHDEPTH}"
+  git -c advice.detachedHead=false checkout --force "${gitref}"
   git fetch origin --depth="${GIT_FETCHDEPTH}" --update-shallow
 
   log "Commit information"
diff --git a/build-portable.sh b/build-portable.sh
index 426caca..521a06a 100755
--- a/build-portable.sh
+++ b/build-portable.sh
@@ -98,12 +98,13 @@ get_sources() {
   mkdir -p "${DIR_REPO}"
   pushd "${DIR_REPO}"
 
+  # TODO: re-investigate and optimize this
   git clone --depth 1 "${gitrepo}" .
   git fetch origin --depth "${GIT_FETCHDEPTH}" "${gitref}"
-  git -c advice.detachedHead=false checkout --force "${gitref}"
   git ls-remote --tags --sort=version:refname 2>&- \
     | awk "END{printf \"+%s:%s\\n\",\$2,\$2}" \
     | git fetch origin --depth="${GIT_FETCHDEPTH}"
+  git -c advice.detachedHead=false checkout --force "${gitref}"
   git fetch origin --depth="${GIT_FETCHDEPTH}" --update-shallow
 
   log "Commit information"