diff --git a/source/FrameStand.pas b/source/FrameStand.pas
index b47c10e..fe3c0f8 100644
--- a/source/FrameStand.pas
+++ b/source/FrameStand.pas
@@ -1,5 +1,5 @@
 (*
-  Copyright 2015, TFrameStand
+  Copyright 2016, TFrameStand
 
   Author:
     Andrea Magni <andrea(dot)magni(at)gmail(dot)com>
@@ -427,6 +427,12 @@ constructor TFrameInfo<T>.Create(const AFrameStand: TFrameStand;
     FStand.Align := TAlignLayout.Contents;
     FStand.StyleName := 'container';
   end;
+{$if compilerversion >= 31}
+  // 10.1 Berlin and later
+  // See https://github.com/andrea-magni/TFrameStand/issues/12
+  // also see https://quality.embarcadero.com/browse/RSP-14806
+  FStand.Align := TAlignLayout.Contents;
+{$ifend}
   FStand.Visible := False;
 
   // PARENT