diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 2c66ab6e83c0857ab9de997542f27d22261c32a1..cce302e4e199f22c039452db0e856e9b75fe49f1 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -181,6 +181,9 @@
 \AtBeginDocument{
 	\makeatletter
 	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index e4f96525a00ac849ff4f26be4cf7ef394c59829c..16cc82a7d3db8588820fcde73d8ec963b9b562ee 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -191,6 +191,9 @@
 \AtBeginDocument{
 	\makeatletter
 	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index fcca06ae8fa1951bc3ca005096a39089c108354d..7cd02ba8c01001115fb2782932eb536521699a39 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -98,6 +98,9 @@
 % load config at beginning of document
 \AtBeginDocument{
 	\makeatletter
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{
diff --git a/src/config.tex b/src/config.tex
index 2a4f58ea45dd925bde7a850f18cbd3ad58352e0e..bc5de7e796bc601bb4eb0d48842db0f9c209317c 100644
--- a/src/config.tex
+++ b/src/config.tex
@@ -12,9 +12,6 @@
 	\setcapwidth[c]{0.8\textwidth} % center all captions
 	%\setcapwidth[l]{0.8\textwidth} % leftalign all captions
 \fi
-\@ifpackageloaded{subfigure}{
-	\newcommand{\subfigureautorefname}{\figureautorefname}
-}{}%
 \@ifpackageloaded{biblatex}{
 	\ExecuteBibliographyOptions{
 		bibwarn=true,