Broken commit to help solving #55