diff --git a/include/class_board_design_settings.h b/include/class_board_design_settings.h
index 579d7dad38..a651e982fc 100644
--- a/include/class_board_design_settings.h
+++ b/include/class_board_design_settings.h
@@ -100,7 +100,7 @@ public:
      * returns a bit-mask of all the element categories that are visible
      * @return int - the visible element categories in bit-mapped form.
      */
-    long GetVisibleElements() const
+    int GetVisibleElements() const
     {
         return m_VisibleElements;
     }
@@ -110,7 +110,7 @@ public:
      * changes the bit-mask of visible element categories
      * @param aMask = The new bit-mask of visible element categories
      */
-    void SetVisibleElements( long aMask )
+    void SetVisibleElements( int aMask )
     {
         m_VisibleElements = aMask;
     }
@@ -198,7 +198,7 @@ private:
     int       m_CopperLayerCount;   ///< Number of copper layers for this design
     LAYER_MSK m_EnabledLayers;      ///< Bit-mask for layer enabling
     LAYER_MSK m_VisibleLayers;      ///< Bit-mask for layer visibility
-    long      m_VisibleElements;    ///< Bit-mask for element category visibility
+    int       m_VisibleElements;    ///< Bit-mask for element category visibility
     int       m_boardThickness;     ///< Board thickness for 3D viewer
 };
 
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index 2121c98e61..99211a7e4d 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -647,7 +647,7 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
                       FMTIU( aBoard->GetGridOrigin().x ).c_str(),
                       FMTIU( aBoard->GetGridOrigin().y ).c_str() );
 
-    m_out->Print( aNestLevel+1, "(visible_elements %lX)\n",
+    m_out->Print( aNestLevel+1, "(visible_elements %X)\n",
                   aBoard->GetDesignSettings().GetVisibleElements() );
 
     aBoard->GetPlotOptions().Format( m_out, aNestLevel+1 );
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp
index 1c1a920bf8..a1fd78a9b0 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/legacy_plugin.cpp
@@ -870,7 +870,7 @@ void LEGACY_PLUGIN::loadSETUP()
 
         else if( TESTLINE( "VisibleElements" ) )
         {
-            long visibleElements = hexParse( line + SZ( "VisibleElements" ) );
+            int visibleElements = hexParse( line + SZ( "VisibleElements" ) );
             bds.SetVisibleElements( visibleElements );
         }
 
@@ -3071,7 +3071,7 @@ void LEGACY_PLUGIN::saveSETUP( const BOARD* aBoard ) const
     fprintf( m_fp, "GridOrigin %s\n", fmtBIUPoint( aBoard->GetGridOrigin() ).c_str() );
     fprintf( m_fp, "AuxiliaryAxisOrg %s\n", fmtBIUPoint( aBoard->GetAuxOrigin() ).c_str() );
 
-    fprintf( m_fp, "VisibleElements %lX\n", bds.GetVisibleElements() );
+    fprintf( m_fp, "VisibleElements %X\n", bds.GetVisibleElements() );
 
     {
         STRING_FORMATTER sf;