diff --git a/libmscore/beam.cpp b/libmscore/beam.cpp
index 0b107e642ffb..a0b61918fc9b 100644
--- a/libmscore/beam.cpp
+++ b/libmscore/beam.cpp
@@ -675,8 +675,8 @@ static void initBeamMetrics()
       B(0,  3,  4,  13, 1);
       B(0,  3,  5,  13, 2);
       B(0,  3,  6,  14, 4);
-      B(0,  3,  7,  13, 4);
-      B(0,  3,  8,  13, 6);
+      B(0,  3,  7,  14, 4);
+      B(0,  3,  8,  14, 6);
 
       B(0,  3,  2,  11, -1);
       B(0,  3,  1,  11, -2);
@@ -716,17 +716,17 @@ static void initBeamMetrics()
 
       B(0, -5,-4,   16, 2);
       B(0, -5,-3,   16, 2);
-      B(0, -5,-2,   16, 2);
-      B(0, -5,-1,   16, 2);
-      B(0, -5, 0,   16, 4);
-      B(0, -5, 1,   16, 5);
-      B(0, -5, 2,   16, 5);
+      B(0, -5,-2,   17, 2);
+      B(0, -5,-1,   17, 2);
+      B(0, -5, 0,   18, 4);
+      B(0, -5, 1,   18, 5);
+      B(0, -5, 2,   21, 5);
 
       B(0,  2, 3,   12, 1);
       B(0,  2, 4,   12, 4);
       B(0,  2, 5,   13, 4);  // F
       B(0,  2, 6,   15, 5);
-      B(0,  2, 7,   13, 6);
+      B(0,  2, 7,   15, 6);
       B(0,  2, 8,   16, 8);
       B(0,  2, 9,   16, 8);
 
@@ -741,7 +741,7 @@ static void initBeamMetrics()
       // =================================== E
       B(1, 8, 8,  -12, 0);
       B(0, 1, 1,   13, 0);
-      B(1, 1, 1,   -9, 0);
+      B(1, 1, 1,  -12, 0);
 
       B(1, 8, 7, -12, -1);
       B(1, 8, 6, -12, -4);
@@ -753,8 +753,8 @@ static void initBeamMetrics()
 
       B(1, 15, 11, -21, -1);
       B(1, 15, 10, -21, -1);
-      B(1, 15,  9, -21, -1);
-      B(1, 15,  8, -21, -1);
+      B(1, 15,  9, -21, -4);
+      B(1, 15,  8, -21, -5);
 
       B(1,  1,  8, -11,  6);
       B(1,  1,  7, -11,  6);
@@ -766,7 +766,7 @@ static void initBeamMetrics()
       B(1,  8, 12, -12,  5);
       B(1,  8, 13, -12,  4);
       B(1,  8, 14, -12,  5);
-      B(1,  8, 15, -12,  1);
+      B(1,  8, 15, -12,  5);
 
       B(0,  1,  0, 11,  -1);
       B(0,  1, -1, 11,  -2);
@@ -796,7 +796,7 @@ static void initBeamMetrics()
       // =================================== F
       B(1, 7, 7,-13, 0);      //F
       B(0, 0, 0, 12, 0);
-      B(0, 7, 7, 10, 0);
+      B(0, 7, 7, 12, 0);
 
       B(1, 7, 6, -13, -1);
       B(1, 7, 5, -13, -2);
@@ -908,8 +908,8 @@ static void initBeamMetrics()
       B(1,  5,  4, -13, -1);
       B(1,  5,  3, -13, -2);
       B(1,  5,  2, -14, -4);
-      B(1,  5,  1, -14, -4);
-      B(1,  5,  0, -13, -6);
+      B(1,  5,  1, -15, -4);
+      B(1,  5,  0, -15, -6);
 
       B(1, 12, 11, -15, -1);
       B(1, 12, 10, -15, -2);
@@ -1164,6 +1164,28 @@ void Beam::computeStemLen(const QList<ChordRest*>& cl, qreal& py1, int beamLevel
             if (hasNoSlope())
                   bm.s = 0.0;
 
+            // special case for two beamed notes: flatten to max of 1sp
+            static int maxShortSlant = 4;
+            if (bm.l && elements().size() == 2) {
+                  //qDebug("computeStemLen: l = %d, s = %d", (int)bm.l, (int)bm.s);
+                  if (bm.s > maxShortSlant) {
+                        // slant downward
+                        // lengthen first stem if down
+                        if (bm.l > 0)
+                              bm.l += bm.s - maxShortSlant;
+                        // flatten beam
+                        bm.s = maxShortSlant;
+                        }
+                  else if (bm.s < -maxShortSlant) {
+                        // slant upward
+                        // lengthen first stem if up
+                        if (bm.l < 0)
+                              bm.l -= -maxShortSlant - bm.s;
+                        // flatten beam
+                        bm.s = -maxShortSlant;
+                        }
+                  }
+
             if (bm.l) {
                   if (bm.l > 0)
                         bm.l -= graceStemLengthCorrection;
@@ -1264,6 +1286,10 @@ void Beam::computeStemLen(const QList<ChordRest*>& cl, qreal& py1, int beamLevel
                   uint interval = qAbs((l2 - l1) / 2);
                   minS          = minSlant(interval);
                   maxS          = maxSlant(interval);
+                  if (elements().size() == 2) {
+                        minS = qMin(minS, 2);
+                        maxS = qMin(maxS, 4);
+                        }
                   }
             int ll1;
             if (_up) {
diff --git a/mtest/libmscore/beam/Beam-A.mscx b/mtest/libmscore/beam/Beam-A.mscx
index d156fa6f4fbb..befc90af70c8 100644
--- a/mtest/libmscore/beam/Beam-A.mscx
+++ b/mtest/libmscore/beam/Beam-A.mscx
@@ -260,8 +260,8 @@
           </Chord>
         <Beam id="7">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
-          <l2>-8</l2>
+          <l1>-5</l1>
+          <l2>-9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -288,8 +288,8 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
-          <l2>-9</l2>
+          <l1>-7</l1>
+          <l2>-11</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -420,7 +420,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>9</l1>
+          <l1>8</l1>
           <l2>4</l2>
           </Beam>
         <Chord>
@@ -444,7 +444,7 @@
       <Measure number="6">
         <Beam id="15">
           <StemDirection>up</StemDirection>
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -487,7 +487,7 @@
           </Chord>
         <Beam id="17">
           <StemDirection>up</StemDirection>
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -567,7 +567,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -588,7 +588,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -616,7 +616,7 @@
         <Beam id="22">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -636,7 +636,7 @@
           </Chord>
         <Beam id="23">
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -657,7 +657,7 @@
           </Chord>
         <Beam id="24">
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -723,7 +723,7 @@
             </Note>
           </Chord>
         <Beam id="27">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -743,7 +743,7 @@
             </Note>
           </Chord>
         <Beam id="28">
-          <l1>11</l1>
+          <l1>12</l1>
           <l2>16</l2>
           </Beam>
         <Chord>
@@ -770,7 +770,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="29">
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -811,7 +811,7 @@
             </Note>
           </Chord>
         <Beam id="31">
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -1064,7 +1064,7 @@
           </Chord>
         <Beam id="42">
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1092,7 +1092,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1113,7 +1113,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1135,7 +1135,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-B.mscx b/mtest/libmscore/beam/Beam-B.mscx
index 408a5eb46fe9..bd04f946d15c 100644
--- a/mtest/libmscore/beam/Beam-B.mscx
+++ b/mtest/libmscore/beam/Beam-B.mscx
@@ -255,7 +255,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>9</l1>
+          <l1>8</l1>
           <l2>4</l2>
           </Beam>
         <Chord>
@@ -276,7 +276,7 @@
             </Note>
           </Chord>
         <Beam id="8">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -326,7 +326,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -348,7 +348,7 @@
           </Chord>
         <Beam id="11">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -626,7 +626,7 @@
         <Beam id="23">
           <StemDirection>up</StemDirection>
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -647,7 +647,7 @@
         <Beam id="24">
           <StemDirection>up</StemDirection>
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -675,7 +675,7 @@
         <Beam id="25">
           <StemDirection>up</StemDirection>
           <l1>-5</l1>
-          <l2>1</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -716,7 +716,7 @@
           </Chord>
         <Beam id="27">
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -783,7 +783,7 @@
           </Chord>
         <Beam id="30">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -803,7 +803,7 @@
           </Chord>
         <Beam id="31">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -830,7 +830,7 @@
           </LayoutBreak>
         <Beam id="32">
           <l1>21</l1>
-          <l2>15</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -871,7 +871,7 @@
           </Chord>
         <Beam id="34">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1142,7 +1142,7 @@
             </Note>
           </Chord>
         <Beam id="46">
-          <l1>7</l1>
+          <l1>8</l1>
           <l2>12</l2>
           </Beam>
         <Chord>
@@ -1162,7 +1162,7 @@
             </Note>
           </Chord>
         <Beam id="47">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -1211,7 +1211,7 @@
           </Chord>
         <Beam id="49">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -1233,7 +1233,7 @@
           </Chord>
         <Beam id="50">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
diff --git a/mtest/libmscore/beam/Beam-C.mscx b/mtest/libmscore/beam/Beam-C.mscx
index 4ace955ec9a7..5ea0ff481a82 100644
--- a/mtest/libmscore/beam/Beam-C.mscx
+++ b/mtest/libmscore/beam/Beam-C.mscx
@@ -233,7 +233,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -254,7 +254,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -281,7 +281,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="8">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -323,7 +323,7 @@
             </Note>
           </Chord>
         <Beam id="10">
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -533,7 +533,7 @@
           </Chord>
         <Beam id="19">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -560,7 +560,7 @@
           </LayoutBreak>
         <Beam id="20">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -580,7 +580,7 @@
           </Chord>
         <Beam id="21">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -601,7 +601,7 @@
           </Chord>
         <Beam id="22">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -686,7 +686,7 @@
             </Note>
           </Chord>
         <Beam id="26">
-          <l1>7</l1>
+          <l1>8</l1>
           <l2>12</l2>
           </Beam>
         <Chord>
@@ -713,7 +713,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="27">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -754,7 +754,7 @@
             </Note>
           </Chord>
         <Beam id="29">
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -841,7 +841,7 @@
           </Chord>
         <Beam id="33">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -864,7 +864,7 @@
       <Measure number="13">
         <Beam id="34">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -943,7 +943,7 @@
           </Chord>
         <Beam id="37">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -963,7 +963,7 @@
           </Chord>
         <Beam id="38">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -990,7 +990,7 @@
           </LayoutBreak>
         <Beam id="39">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1010,7 +1010,7 @@
           </Chord>
         <Beam id="40">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1031,7 +1031,7 @@
           </Chord>
         <Beam id="41">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-D.mscx b/mtest/libmscore/beam/Beam-D.mscx
index 49ab30cd7ed2..b5cc5f1bcdec 100644
--- a/mtest/libmscore/beam/Beam-D.mscx
+++ b/mtest/libmscore/beam/Beam-D.mscx
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>2</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -563,7 +563,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>-8</l1>
-          <l2>-3</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -591,7 +591,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>-7</l1>
-          <l2>-2</l2>
+          <l2>-3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -611,7 +611,7 @@
           </Chord>
         <Beam id="22">
           <l1>-8</l1>
-          <l2>-3</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -632,7 +632,7 @@
           </Chord>
         <Beam id="23">
           <l1>-8</l1>
-          <l2>0</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -698,8 +698,8 @@
             </Note>
           </Chord>
         <Beam id="26">
-          <l1>6</l1>
-          <l2>8</l2>
+          <l1>7</l1>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -718,8 +718,8 @@
             </Note>
           </Chord>
         <Beam id="27">
-          <l1>6</l1>
-          <l2>8</l2>
+          <l1>7</l1>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -745,8 +745,8 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="28">
-          <l1>6</l1>
-          <l2>10</l2>
+          <l1>8</l1>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -765,8 +765,8 @@
             </Note>
           </Chord>
         <Beam id="29">
-          <l1>6</l1>
-          <l2>11</l2>
+          <l1>9</l1>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -786,8 +786,8 @@
             </Note>
           </Chord>
         <Beam id="30">
-          <l1>6</l1>
-          <l2>11</l2>
+          <l1>12</l1>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -874,7 +874,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -898,8 +898,8 @@
       <Measure number="13">
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>17</l1>
-          <l2>23</l2>
+          <l1>21</l1>
+          <l2>25</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -978,7 +978,7 @@
           </Chord>
         <Beam id="38">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -998,7 +998,7 @@
           </Chord>
         <Beam id="39">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1066,7 +1066,7 @@
           </Chord>
         <Beam id="42">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-E.mscx b/mtest/libmscore/beam/Beam-E.mscx
index d98f2e895207..fa78fc3bb059 100644
--- a/mtest/libmscore/beam/Beam-E.mscx
+++ b/mtest/libmscore/beam/Beam-E.mscx
@@ -159,8 +159,8 @@
           </Chord>
         <Beam id="3">
           <StemDirection>up</StemDirection>
-          <l1>-7</l1>
-          <l2>-7</l2>
+          <l1>-10</l1>
+          <l2>-10</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
+          <l1>-5</l1>
           <l2>-9</l2>
           </Beam>
         <Chord>
@@ -399,7 +399,7 @@
           </Chord>
         <Beam id="13">
           <l1>9</l1>
-          <l2>8</l2>
+          <l2>5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -418,8 +418,8 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>9</l1>
-          <l2>8</l2>
+          <l1>8</l1>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -442,7 +442,7 @@
       <Measure number="6">
         <Beam id="15">
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -463,7 +463,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -485,7 +485,7 @@
         <Beam id="17">
           <StemDirection>up</StemDirection>
           <l1>-10</l1>
-          <l2>-4</l2>
+          <l2>-6</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -564,7 +564,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -585,7 +585,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -633,7 +633,7 @@
           </Chord>
         <Beam id="23">
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -654,7 +654,7 @@
           </Chord>
         <Beam id="24">
           <l1>4</l1>
-          <l2>5</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -721,7 +721,7 @@
           </Chord>
         <Beam id="27">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -741,7 +741,7 @@
           </Chord>
         <Beam id="28">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -768,7 +768,7 @@
           </LayoutBreak>
         <Beam id="29">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -788,7 +788,7 @@
           </Chord>
         <Beam id="30">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -809,7 +809,7 @@
           </Chord>
         <Beam id="31">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -875,7 +875,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
@@ -896,7 +896,7 @@
           </Chord>
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -920,7 +920,7 @@
       <Measure number="13">
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>17</l1>
+          <l1>18</l1>
           <l2>22</l2>
           </Beam>
         <Chord>
@@ -940,7 +940,7 @@
             </Note>
           </Chord>
         <Beam id="37">
-          <l1>19</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -962,7 +962,7 @@
           </Chord>
         <Beam id="38">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>23</l1>
           <l2>27</l2>
           </Beam>
         <Chord>
@@ -1058,7 +1058,7 @@
             </Note>
           </Chord>
         <Beam id="42">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -1087,7 +1087,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1108,7 +1108,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>28</l1>
-          <l2>20</l2>
+          <l2>24</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1130,7 +1130,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>28</l1>
-          <l2>20</l2>
+          <l2>24</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-F.mscx b/mtest/libmscore/beam/Beam-F.mscx
index 8d6fde05e47e..4391f8ac90b1 100644
--- a/mtest/libmscore/beam/Beam-F.mscx
+++ b/mtest/libmscore/beam/Beam-F.mscx
@@ -159,8 +159,8 @@
           </Chord>
         <Beam id="3">
           <StemDirection>down</StemDirection>
-          <l1>24</l1>
-          <l2>24</l2>
+          <l1>26</l1>
+          <l2>26</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
+          <l1>-5</l1>
           <l2>-9</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -418,7 +418,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -443,7 +443,7 @@
         <Beam id="15">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -464,7 +464,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -486,7 +486,7 @@
         <Beam id="17">
           <StemDirection>up</StemDirection>
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -565,7 +565,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -586,7 +586,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -614,7 +614,7 @@
         <Beam id="22">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -634,7 +634,7 @@
           </Chord>
         <Beam id="23">
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -655,7 +655,7 @@
           </Chord>
         <Beam id="24">
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -722,7 +722,7 @@
           </Chord>
         <Beam id="27">
           <l1>12</l1>
-          <l2>7</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -742,7 +742,7 @@
           </Chord>
         <Beam id="28">
           <l1>12</l1>
-          <l2>7</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -876,7 +876,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -897,7 +897,7 @@
           </Chord>
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
@@ -921,7 +921,7 @@
       <Measure number="13">
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -941,7 +941,7 @@
             </Note>
           </Chord>
         <Beam id="37">
-          <l1>17</l1>
+          <l1>18</l1>
           <l2>22</l2>
           </Beam>
         <Chord>
@@ -963,7 +963,7 @@
           </Chord>
         <Beam id="38">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>21</l1>
           <l2>25</l2>
           </Beam>
         <Chord>
@@ -1088,7 +1088,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>26</l1>
-          <l2>20</l2>
+          <l2>22</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1109,7 +1109,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1131,7 +1131,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-G.mscx b/mtest/libmscore/beam/Beam-G.mscx
index d3a254e14daf..7c602419c87e 100644
--- a/mtest/libmscore/beam/Beam-G.mscx
+++ b/mtest/libmscore/beam/Beam-G.mscx
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>-3</l1>
+          <l1>-4</l1>
           <l2>-8</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-4</l1>
           <l2>-8</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -418,7 +418,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -442,7 +442,7 @@
       <Measure number="6">
         <Beam id="15">
           <StemDirection>up</StemDirection>
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -464,7 +464,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -547,7 +547,7 @@
         <Beam id="19">
           <StemDirection>up</StemDirection>
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -568,7 +568,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -616,7 +616,7 @@
           </Chord>
         <Beam id="22">
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -637,7 +637,7 @@
           </Chord>
         <Beam id="23">
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -844,7 +844,7 @@
           </Chord>
         <Beam id="32">
           <StemDirection>down</StemDirection>
-          <l1>11</l1>
+          <l1>12</l1>
           <l2>16</l2>
           </Beam>
         <Chord>
@@ -865,7 +865,7 @@
           </Chord>
         <Beam id="33">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -889,7 +889,7 @@
       <Measure number="13">
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -909,7 +909,7 @@
             </Note>
           </Chord>
         <Beam id="35">
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -931,7 +931,7 @@
           </Chord>
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -1032,7 +1032,7 @@
         <Beam id="40">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>18</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1060,7 +1060,7 @@
         <Beam id="41">
           <StemDirection>down</StemDirection>
           <l1>23</l1>
-          <l2>17</l2>
+          <l2>19</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1081,7 +1081,7 @@
         <Beam id="42">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>17</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1103,7 +1103,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>16</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/vtest/beams-16-ref.png b/vtest/beams-16-ref.png
new file mode 100644
index 000000000000..7015a238d8d3
Binary files /dev/null and b/vtest/beams-16-ref.png differ
diff --git a/vtest/beams-16.mscz b/vtest/beams-16.mscz
new file mode 100644
index 000000000000..3d2bbcda04e8
Binary files /dev/null and b/vtest/beams-16.mscz differ
diff --git a/vtest/gen b/vtest/gen
index 44dee6f5ec04..306ef267112e 100755
--- a/vtest/gen
+++ b/vtest/gen
@@ -47,7 +47,7 @@ else
        tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4 tuplets-1 breath-1\
        harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7 harmony-8 harmony-9 harmony-10 harmony-11\
        beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7 beams-8 beams-9 beams-10\
-       beams-11 beams-12 beams-13 beams-14 beams-15\
+       beams-11 beams-12 beams-13 beams-14 beams-15 beams-16\
        user-offset-1 user-offset-2 chord-space-1 chord-space-2 tablature-1 image-1\
        lyrics-1 lyrics-2 lyrics-3 lyrics-4 voice-1 voice-2 slash-1 slash-2 system-1 system-2 system-3"
 fi
diff --git a/vtest/gen.bat b/vtest/gen.bat
index df94840aaf3f..95608cb33c6c 100644
--- a/vtest/gen.bat
+++ b/vtest/gen.bat
@@ -22,7 +22,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,tuplets-1,breath-1, ^
  harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7,harmony-8,harmony-9,harmony-10,harmony-11, ^
  beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8,beams-9,beams-10, ^
- beams-11,beams-12,beams-13,beams-14,beams-15, ^
+ beams-11,beams-12,beams-13,beams-14,beams-15,beams-16, ^
  user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^
  lyrics-1,lyrics-2,lyrics-3,lyrics-4,voice-1,voice-2,slash-1,slash-2,system-1,system-2,system-3