diff --git a/pom.xml b/pom.xml
index 0e0e5d7c..f6bc6ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,8 @@
 							<goal>jar</goal>
 						</goals>
 						<configuration>
-							<applyJavadocSecurityFix>true</applyJavadocSecurityFix>
+							<javadocExecutable>${JDK8_HOME}/bin/javadoc</javadocExecutable>
+							<useStandardDocletOptions>true</useStandardDocletOptions>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/src/main/java/com/univocity/parsers/annotations/helpers/AnnotationHelper.java b/src/main/java/com/univocity/parsers/annotations/helpers/AnnotationHelper.java
index d9c20882..bf846b71 100644
--- a/src/main/java/com/univocity/parsers/annotations/helpers/AnnotationHelper.java
+++ b/src/main/java/com/univocity/parsers/annotations/helpers/AnnotationHelper.java
@@ -619,7 +619,7 @@ public static String[] deriveHeaderNamesFromFields(Class<?> beanClass, MethodFil
 	 *
 	 * @param beanClass the class whose hierarchy will be searched
 	 * @param annotation the annotation to locate
-	 *
+	 * @param <T> the type of the annotation to return
 	 * @return the annotation of the given class or its most immediate parent, or {@code null} if not found.
 	 */
 	public static <T extends Annotation> T findAnnotationInClass(Class<?> beanClass, Class<T> annotation) {