2 files changed, 7 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 4288a72..f0d85ff 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -45,7 +45,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
         if (geocode == null) {
             return false;
         }
-        return GCConstants.PATTERN_GC_CODE.matcher(geocode).matches();
+        return GCConstants.PATTERN_GC_CODE.matcher(geocode).matches() || GCConstants.PATTERN_TB_CODE.matcher(geocode).matches();
     }
 
     @Override
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index 065589b..12e7e22 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -30,6 +30,12 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
         }
     }
 
+    public static void testCanHandle() {
+        assertTrue(GCConnector.getInstance().canHandle("GC2MEGA"));
+        assertTrue(GCConnector.getInstance().canHandle("TB3F651"));
+        assertFalse(GCConnector.getInstance().canHandle("OXZZZZZ"));
+    }
+
     public static void testBaseCodings() {
         assertEquals(2045702, GCConstants.gccodeToGCId("GC2MEGA"));
     }