diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp
index c4d7ee0b02..c5bd4c2518 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/indexer/indexer_tool/indexer_tool.cpp
@@ -108,7 +108,10 @@ int main(int argc, char ** argv)
                         path + "visibility.txt");
     classificator::PrepareForFeatureGeneration();
 
-    genInfo.datFilePrefix = path + FLAGS_output + (FLAGS_bucketing_level > 0 ? "-" : "");
+    if (FLAGS_output.empty())
+      genInfo.datFilePrefix = path;
+    else
+      genInfo.datFilePrefix = path + FLAGS_output + (FLAGS_bucketing_level > 0 ? "-" : "");
     genInfo.datFileSuffix = DATA_FILE_EXTENSION;
     genInfo.cellBucketingLevel = FLAGS_bucketing_level;
     genInfo.m_maxScaleForWorldFeatures = FLAGS_worldmap_max_zoom;
diff --git a/tools/unix/build_common_planet.sh b/tools/unix/build_common_planet.sh
index 1696c97067..144e6d7577 100755
--- a/tools/unix/build_common_planet.sh
+++ b/tools/unix/build_common_planet.sh
@@ -92,4 +92,4 @@ fi
 
 $PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --bucketing_level=$BUCKETING_LEVEL \
-  --generate_final_data --sort_features=true --generate_index --output=101103 --worldmap_max_zoom=5
+  --generate_final_data --sort_features=true --generate_index --worldmap_max_zoom=5