diff --git a/moderncvbodyi.sty b/moderncvbodyi.sty
index bde40b7..b1b6cf0 100644
--- a/moderncvbodyi.sty
+++ b/moderncvbodyi.sty
@@ -50,6 +50,9 @@
 %   default moderncv \photo (change the definition such that by default the photo and its box align with the section bars
 \RenewDocumentCommand{\photo}{O{\hintscolumnwidth-0.8pt-2\fboxsep}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}%
 
+%% include moderncv Skillmatrix code  
+\input{moderncvbodyiskillmatrix.sty}
+
 % commands
 \renewcommand*{\recomputecvbodylengths}{%
   % body lengths
@@ -59,11 +62,10 @@
   \setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
   \setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
   \setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
+  \recomputecvskillmatrixlengths
   % regular lengths
   \setlength{\parskip}{0\p@}}
-  
-%% include moderncv code  
-\input{moderncvskillmatrix.sty}
+
 
 \@initializelength{\baseletterheight}
 \settoheight{\baseletterheight}{\sectionstyle{o}}
diff --git a/moderncvskillmatrix.sty b/moderncvbodyiskillmatrix.sty
similarity index 90%
rename from moderncvskillmatrix.sty
rename to moderncvbodyiskillmatrix.sty
index a126d20..7f7df3f 100644
--- a/moderncvskillmatrix.sty
+++ b/moderncvbodyiskillmatrix.sty
@@ -26,14 +26,14 @@
 \@initializelength{\skillmatrixcolumnwidth}
 \@initializelength{\skillmatrixcommentwidth}
 \@initializelength{\skillmatrixcommentpadding}
-\RenewDocumentCommand{\recomputecvbodylengths}{}{%
-  % body lengths
-  \setlength{\maincolumnwidth}{\textwidth-\leftskip-\rightskip-\separatorcolumnwidth-\hintscolumnwidth}%
-  \setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
-  \setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
-  \setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
-  \setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
-  \setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
+\NewDocumentCommand{\recomputecvskillmatrixlengths}{}{%
+%   % body lengths
+%   \setlength{\maincolumnwidth}{\textwidth-\leftskip-\rightskip-\separatorcolumnwidth-\hintscolumnwidth}%
+%   \setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
+%   \setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
+%   \setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+%   \setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
+%   \setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
   \setlength{\cvskillwidth}{\widthof{\cvSkill{5}}}
   \setlength{\cvskillexperiencewidth}{\widthof{``Jahre''}}
   \setlength{\skillmatrixcolumnwidth}{0.45\maincolumnwidth}%