diff --git a/fphw.cls b/fphw.cls
index f31c77d..21a9d43 100644
--- a/fphw.cls
+++ b/fphw.cls
@@ -32,9 +32,6 @@
 % UTF-8 is best coding
 \RequirePackage[utf8]{inputenc}
 
-% We won't need those ugly margins
-\RequirePackage{geometry}
-
 % Header and footers, we will use the titles also
 \RequirePackage{fancyhdr}
 
@@ -58,7 +55,10 @@
     \renewcommand{\StudentLang}{Nombre estudiante}
 }
 
+\PassOptionsToClass{a4paper}{article}
+
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+
 \ProcessOptions\relax
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -82,6 +82,8 @@
 \titleformat{\subsubsection}[runin]{\bfseries\itshape}{ \thesubsubsection.}
 {1mm}{}[.\quad]
 
+% Geometry lets us modify the sizes of the document nicely
+\RequirePackage{geometry}
 % Decent margins for the documents, as it is meant to be printed
 \geometry{left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm}