diff --git a/docs/Contributors.txt b/docs/Contributors.txt
index 72be48d89d..76c0e240ac 100644
--- a/docs/Contributors.txt
+++ b/docs/Contributors.txt
@@ -32,6 +32,7 @@ Cliff Baeseman
 Colin Western
 Curtis White
 Daniel Oom
+Daniel Simões de Almeida
 Darek Mazur
 Darius Blaszijk
 David Guadagnini
diff --git a/docs/contributors.utf8 b/docs/contributors.utf8
index f609c23750..111f5eda52 100644
--- a/docs/contributors.utf8
+++ b/docs/contributors.utf8
@@ -8,6 +8,7 @@ Marc
 ---
 Antônio Galvão
 Bogusław Brandys
+Daniel Simões de Almeida
 Diogo Piçarra
 Juan Salvador Pérez García
 Júnior Gonçalves
diff --git a/lcl/include/customlabel.inc b/lcl/include/customlabel.inc
index d7df516857..9ef4af7d1d 100644
--- a/lcl/include/customlabel.inc
+++ b/lcl/include/customlabel.inc
@@ -386,8 +386,8 @@ var
   OldFontHeight: LongInt;
 begin
   Result:=false;
-  if not CalcFittingFontHeight(GetLabelText,Width,Height,NeededWidth,NeededHeight,
-                               NewFontHeight) then exit;
+  if not CalcFittingFontHeight(GetLabelText,Width,Height,NewFontHeight,NeededWidth,
+                               NeededHeight) then exit;
   if Font.Height=NewFontHeight then exit;
   //debugln('TCustomLabel.AdjustFontForOptimalFill OldFontHeight=',dbgs(Font.Height),' NewFontHeight=',dbgs(NewFontHeight));
   OldFontHeight:=Font.Height;