diff --git a/data/build-package.download b/data/build-package.download
index 3f0bddd..1c76e02 100644
--- a/data/build-package.download
+++ b/data/build-package.download
@@ -238,22 +238,22 @@ grab_apk_from_ogapps () {
 	case "${1}" in
 		"com.google.android.syncadapters.calendar" )
 			APK_URL="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/15/nodpi/2015080710.apk"
+			API_LETTER=common
 		;;
 
 		* )
 			APK_URL="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/${4}/nodpi/${4}.apk"
+			case "${4}" in
+				19 ) API_LETTER=K ;;
+				21 ) API_LETTER=L ;;
+				23 ) API_LETTER=M ;;
+				24 ) API_LETTER=N ;;
+				26 ) API_LETTER=O ;;
+				28 ) API_LETTER=P ;;
+			esac
 		;;
 	esac
 
-	case "${4}" in
-		19 ) API_LETTER=K ;;
-		21 ) API_LETTER=L ;;
-		23 ) API_LETTER=M ;;
-		24 ) API_LETTER=N ;;
-		26 ) API_LETTER=O ;;
-		28 ) API_LETTER=P ;;
-	esac
-
 	APK_DEST="${CWD}/Full/gsync/${API_LETTER}/${2}/${3}"
 
 	if [[ -f "${APK_DEST}/${3}.apk.gz" ]]; then