diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
index 02b63cbd36..5a4a9d9c47 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
@@ -136,15 +136,15 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 				collectDBTracks(db, data);
 
 				// save file
-				for (String f : data.keySet()) {
+				for (final String f : data.keySet()) {
 
 					File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
 					if (fout.exists() && !data.get(f).isEmpty()) {
-						f = f + "_" + new SimpleDateFormat("HH-mm.EEEE").format(new Date(data.get(f).findPointToShow().time)); //$NON-NLS-1$
-						fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
+						String fileName = f + "_" + new SimpleDateFormat("HH-mm-ss_EEEE").format(new Date(data.get(f).findPointToShow().time)); //$NON-NLS-1$
+						fout = new File(dir, fileName + ".gpx"); //$NON-NLS-1$
 						int ind = 1;
 						while (fout.exists()) {
-							fout = new File(dir, f + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
+							fout = new File(dir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
 						}
 					}
 
diff --git a/build-scripts/daily_build.sh b/build-scripts/daily_build.sh
index 679b804070..8b2bb1e3bc 100755
--- a/build-scripts/daily_build.sh
+++ b/build-scripts/daily_build.sh
@@ -11,17 +11,19 @@ mkdir -p $LOG_DIR
 echo > $LOG_FILE
 touch  $CLOG_FILE
 
-git pull --rebase 2>&1 >>$LOG_FILE
+cd "${DIRECTORY}"
+git pull --rebase >>$LOG_FILE 2>&1
 
 # 1. Update git directory
 "${DIRECTORY}/update_git.sh" >>$LOG_FILE 2>&1
 
 # 2. Go through branches and generates builds
 "${DIRECTORY}/build_branches.sh" >>$LOG_FILE 2>&1
+
 # exit if nothing was changed
-if [ $? == 0 ]; then
-   exit
-fi
+# if [ $? = 0 ]; then
+#   exit 0
+# fi
 
 # 3. upload to ftp server 
 #"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE