diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly
index 9adf58ff..2091c99a 100644
--- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly
+++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly
@@ -2,6 +2,9 @@ greyTextColor = #(x11-color "dimgray")
 lightGrey = #(x11-color 'grey65)
 middleGrey = #(x11-color 'grey45)
 
+staffLower = { \change Staff = "lower" }
+staffUpper = { \change Staff = "upper" }
+
 #(define my-eyeglassespath
   '((moveto   -3.57   1.80)
      (curveto  -3.65   1.90  -3.55   2.22  -3.33   2.22)
diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly
index e0919e29..03b2d2f7 100644
--- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly
+++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly
@@ -185,7 +185,7 @@ Alto = \context Voice = "two" \relative c' {
   | a, r r ees'
   | d2 r4 fis!
   | g8 fis g4 r bes~
-  | bes8 a f' d b4 e8 cis
+  | bes8 a f' d b4 e8 cis!
   | a4 d8 a bes4. g8
   %65
   | a4. f8 e4. g8
@@ -292,7 +292,7 @@ Tenor = \context Voice = "three" \relative c' {
   | a2
     b4 cis
   %60
-  | d r4 r fis,
+  | \staffUpper \once\stemDown d \staffLower r4 r fis,
   | g8
     a bes4 r c
   | d2 r8 g,4 f8