diff --git a/swig/libccltokenmatch.i b/swig/libccltokenmatch.i
index 32757f86b051bc116a1cdb2e870c7432cd287ff0..a4045e958103bf88f380027de1ae250c65340735 100644
--- a/swig/libccltokenmatch.i
+++ b/swig/libccltokenmatch.i
@@ -6,7 +6,6 @@
   #include <libwccl/values/tokenmatch.h>
 %}
 
-%include "libcclposition.i"
 %include "libcclmatchdata.i"
 %include "libcorpus/libcorpusannotatedsentence.i"
 
@@ -15,15 +14,14 @@
 namespace Wccl {
   class TokenMatch : public MatchData {
   public:
-    explicit TokenMatch(Position position);
     explicit TokenMatch(int pos);
-    
+
     /* --------------------------------------------------------------------- */
     bool empty() const;
 
     /* --------------------------------------------------------------------- */
-    Position first_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
-    Position last_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
+    int first_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
+    int last_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
 
     /* --------------------------------------------------------------------- */
     std::string to_raw_string() const;
@@ -33,4 +31,5 @@ namespace Wccl {
 using namespace std;
 using namespace Wccl;
 
+
 #endif /* SWIG_LIBWCCL_TOKENMATCH_I */