diff --git a/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml b/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml
index 08db970..fc13048 100644
--- a/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml
+++ b/ebike-operations/src/main/resources/mapper/EbikeSiteMapper.xml
@@ -15,7 +15,7 @@
               AND s.site_type = 1
               AND ST_Contains(
                     s.site_polygon::geometry,
-                    ST_MakePoint((b.location[0])::float, (b.location[1])::float)::geometry
+                    ST_SetSRID(ST_MakePoint(ST_X(b.location), ST_Y(b.location)), 4326)
                   )
         ) as in_parking_area;
     </select>
@@ -33,7 +33,7 @@
               AND s.site_type = 2
               AND ST_Contains(
                     s.site_polygon::geometry,
-                    ST_MakePoint((b.location[0])::float, (b.location[1])::float)::geometry
+                    ST_SetSRID(ST_MakePoint(ST_X(b.location), ST_Y(b.location)), 4326)
                   )
         ) as in_no_parking_area;
     </select>