diff --git a/lib/templates/Articles/Astronomy_%26_Astrophysics.lyx b/lib/templates/Articles/Astronomy_%26_Astrophysics.lyx
index ffff0c4be8..b1edda6477 100644
--- a/lib/templates/Articles/Astronomy_%26_Astrophysics.lyx
+++ b/lib/templates/Articles/Astronomy_%26_Astrophysics.lyx
@@ -5,11 +5,20 @@
 \save_transient_properties true
 \origin /systemlyxdir/templates/Articles/
 \textclass aa
-\options referee, bibyear
+\begin_preamble
+% work around bug in the class
+% see https://tex.stackexchange.com/questions/690753
+\usepackage[colorlinks=true,
+            linkcolor=blue,
+            citecolor=blue,
+            filecolor=blue,
+            urlcolor=blue]{hyperref}
+\end_preamble
+\options referee, bibauthoryear
 \use_default_options true
 \maintain_unincluded_children no
 \language english
-\language_package default
+\language_package babel
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -31,6 +40,8 @@
 \output_sync 0
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -46,8 +57,8 @@
 \use_package stackrel 1
 \use_package stmaryrd 1
 \use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
+\cite_engine natbib
+\cite_engine_type authoryear
 \biblio_style plain
 \use_bibtopic false
 \use_indices false
@@ -55,6 +66,7 @@
 \suppress_date false
 \justification false
 \use_refstyle 0
+\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index
@@ -391,13 +403,25 @@ bla.
  A citation:
  
 \begin_inset CommandInset citation
-LatexCommand cite
-key "book-full"
+LatexCommand citet
+key "article-minimal"
 literal "true"
 
 \end_inset
 
 
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Note:
+ the citations are hardcoded by the package options;
+ all selections give the same style
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Acknowledgments
diff --git a/status.24x b/status.24x
index 17c4998473..36e8f7651a 100644
--- a/status.24x
+++ b/status.24x
@@ -52,6 +52,8 @@ What's new
 
 - Fix size of Logical and/or characters in LaTeX output (bug 13099).
 
+- Work around bug in aa.cls in the "Astronomy & Astrophysics" template.
+
 
 * USER INTERFACE