diff --git a/bds/source/java/ch/systemsx/cisd/bds/hcs/Location.java b/bds/source/java/ch/systemsx/cisd/bds/hcs/Location.java
index a18f6750fcb17b809779b612ae2dbff0eb9ebbab..b110adec65631ea3e4e1d61756405736c1924a7c 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/hcs/Location.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/hcs/Location.java
@@ -47,6 +47,7 @@ public final class Location
 
     /**
      * For given <var>position</var> in given <code>geometry</code> returns corresponding <code>Location</code>.
+     * Position should be greater than 0.
      * 
      * @return <code>null</code> if position is out of range.
      */
@@ -56,7 +57,7 @@ public final class Location
         final int columns = geometry.getColumns();
         final int max = columns * geometry.getRows();
         // Given position is within the range.
-        if (position > 0 && position < max)
+        if (position > 0 && position <= max)
         {
             final int modulo = position % columns;
             final int x = modulo == 0 ? columns : modulo;