diff -Nru tgui-0.9-0.9.4+jammy/changelog.md tgui-0.9-0.9.5+jammy/changelog.md
--- tgui-0.9-0.9.4+jammy/changelog.md	2022-06-15 18:15:03.000000000 +0000
+++ tgui-0.9-0.9.5+jammy/changelog.md	2022-07-17 11:10:15.000000000 +0000
@@ -1,3 +1,10 @@
+TGUI 0.9.5  (17 July 2022)
+--------------------------
+
+- Fixed Gui Builder crash when creating or loading any form
+- Fixed crash when position of ChildWindow depends on its size
+
+
 TGUI 0.9.4  (15 June 2022)
 --------------------------
 
diff -Nru tgui-0.9-0.9.4+jammy/CMakeLists.txt tgui-0.9-0.9.5+jammy/CMakeLists.txt
--- tgui-0.9-0.9.4+jammy/CMakeLists.txt	2022-06-15 18:15:03.000000000 +0000
+++ tgui-0.9-0.9.5+jammy/CMakeLists.txt	2022-07-17 11:10:15.000000000 +0000
@@ -41,7 +41,7 @@
 tgui_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug or Release)")
 
 # Project name and version
-project(TGUI VERSION 0.9.4)
+project(TGUI VERSION 0.9.5)
 
 # TGUI uses the paths from the cmake GNUInstallDirs module as defaults (https://cmake.org/cmake/help/v3.0/module/GNUInstallDirs.html)
 include(GNUInstallDirs)
diff -Nru tgui-0.9-0.9.4+jammy/debian/changelog tgui-0.9-0.9.5+jammy/debian/changelog
--- tgui-0.9-0.9.4+jammy/debian/changelog	2022-06-16 16:48:17.000000000 +0000
+++ tgui-0.9-0.9.5+jammy/debian/changelog	2022-07-17 18:05:58.000000000 +0000
@@ -1,3 +1,8 @@
+tgui-0.9 (0.9.5+jammy) jammy; urgency=low
+  * Fixed Gui Builder crash when creating or loading any form
+  * Fixed crash when position of ChildWindow depends on its size
+ -- Bruno Van de Velde <bruno@texus.me>  Sun, 17 Jul 2022 20:05:58 +0200
+
 tgui-0.9 (0.9.4+jammy) jammy; urgency=low
   * Default theme no longer affects loading widgets from file
   * Added TextAlignment property to ListBox
diff -Nru tgui-0.9-0.9.4+jammy/src/Widgets/ChildWindow.cpp tgui-0.9-0.9.5+jammy/src/Widgets/ChildWindow.cpp
--- tgui-0.9-0.9.4+jammy/src/Widgets/ChildWindow.cpp	2022-06-15 18:15:03.000000000 +0000
+++ tgui-0.9-0.9.5+jammy/src/Widgets/ChildWindow.cpp	2022-07-17 11:10:15.000000000 +0000
@@ -125,7 +125,6 @@
 
     void ChildWindow::setPosition(const Layout2d& position)
     {
-        Layout2d containerPos = position;
         if (m_keepInParent && m_parent && (m_parent->getSize().x > 0) && (m_parent->getSize().y > 0))
         {
             const Vector2f origin{getOrigin().x * getSize().x, getOrigin().y * getSize().y};
@@ -144,11 +143,11 @@
                 else if (x > m_parent->getSize().x - getSize().x)
                     x = std::max(0.f, m_parent->getSize().x - getSize().x);
 
-                containerPos = {x + origin.x, y + origin.y};
+                Container::setPosition({x + origin.x, y + origin.y});
             }
         }
-
-        Container::setPosition(containerPos);
+        else
+            Container::setPosition(position);
 
         // Calculate the distance from the right side that the buttons will need
         float buttonOffsetX = 0;