diff --git a/lib/KorAP/Tokenizer/Units.pm b/lib/KorAP/Tokenizer/Units.pm
index c04ebaf..74bafa9 100644
--- a/lib/KorAP/Tokenizer/Units.pm
+++ b/lib/KorAP/Tokenizer/Units.pm
@@ -33,9 +33,12 @@
   unless ($end) {
     $end = $self->range->before($span->o_end) or return;
   };
-  $span->p_end($end);
+  # $span->p_end($end);
+  # return unless $span->p_end >= $span->p_start;
 
-  return unless $span->p_end >= $span->p_start;
+  # EXPERIMENTAL:
+  return unless $end >= $span->p_start;
+  $span->p_end($end + 1);
 
   $span->hash($s) if $s;