diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 50fbc9d086..0e3f015d39 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -595,7 +595,7 @@ D_PAD* MODULE::GetPad( const wxPoint& aPosition, LSET aLayerMask )
     for( D_PAD* pad = m_Pads;  pad;  pad = pad->Next() )
     {
         // ... and on the correct layer.
-        if( ( pad->GetLayerSet() & aLayerMask ) == 0 )
+        if( !( pad->GetLayerSet() & aLayerMask ).any() )
             continue;
 
         if( pad->HitTest( aPosition ) )
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index 9203b0757b..332e3c5141 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -183,7 +183,7 @@ public:
      */
     bool IsOnCopperLayer() const
     {
-        return  LSET::AllNonCuMask()[GetLayer()];
+        return  IsCopperLayer( GetLayer() );
     }
 
     /// How to fill areas: 0 = use filled polygons, 1 => fill with segments.