diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ImportService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ImportService.java
index 51e798b..fbff409 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ImportService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ImportService.java
@@ -182,10 +182,11 @@
         failureInformationDto.setHousenumber(foreignFailureDataDto.getHousenumber());
 
         setCoordinates(foreignFailureDataDto, failureInformationDto);
-        setLoationType(failureInformationDto);
+        setLocationType(failureInformationDto);
 
         failureInformationDto.setStationIds(new LinkedList<>());
         if( foreignStationId != null && !foreignStationId.isEmpty()) {
+            failureInformationDto.setFaultLocationArea(Constants.LOCATION_TYPE_STATION);
             importStation(failureInformationDto.getStationIds(), foreignStationId);
         }
 
@@ -203,7 +204,7 @@
         failureInformationDto.setObjectReferenceExternalSystem(importDataDto.getAssembledRefId());
     }
 
-    private void setLoationType(FailureInformationDto failureInformationDto) {
+    private void setLocationType(FailureInformationDto failureInformationDto) {
         failureInformationDto.setFaultLocationArea(Constants.LOCATION_TYPE_ADDRESS);
         if (failureInformationDto.getLatitude() != null && failureInformationDto.getLongitude() != null
         && StringUtils.isBlank(failureInformationDto.getStreet())) {
