diff --git a/cleanthesis.sty b/cleanthesis.sty
index 35e4e9a..0c394f9 100644
--- a/cleanthesis.sty
+++ b/cleanthesis.sty
@@ -552,6 +552,13 @@
 	[\phantomsection]
 %
 % > formats: \chapter
+%
+% The following command is used to avoid overlapping
+% of the chapter headline text, see bug/ticket #1
+% Solution adapted according to the comment from "Gonzalo Medina" - Thanks
+% http://tex.stackexchange.com/questions/165878/width-of-chapter-section-with-titlesec
+\newcommand\ctformatchapter[1]{\parbox[t]{\dimexpr\textwidth-4em\relax}{\raggedright#1}}
+%
 \titleformat{\chapter}[display]%
 	{\usekomafont{chapter}}%
 	{\vspace{-8em}\raggedleft{%
@@ -562,7 +569,7 @@
 		}%
 	}%
 	{-2.1em}%
-	{\raggedright}%
+	{\ctformatchapter}%
 	[\phantomsection]
 %
 % > formats: \section
diff --git a/content/chapter-concepts.tex b/content/chapter-concepts.tex
index 222b28e..4464cdc 100644
--- a/content/chapter-concepts.tex
+++ b/content/chapter-concepts.tex
@@ -1,6 +1,6 @@
 % !TEX root = ../thesis-example.tex
 %
-\chapter{Concepts}
+\chapter{Concepts: This text is here to test a very long title, to simulate the line break behavior, to show that an extremely long tilte also works}
 \label{sec:concepts}
 
 \cleanchapterquote{Users do not care about what is inside the box, as long as the box does what they need done.}{Jef Raskin}{about Human Computer Interfaces}
diff --git a/thesis-example.pdf b/thesis-example.pdf
index de81554..21183b7 100644
Binary files a/thesis-example.pdf and b/thesis-example.pdf differ