diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index aacb2ab2..7e828b40 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -700,6 +700,8 @@ def leaflet_chart(lat,lon,name=""):
 
     df = df.replace(0,np.nan)
     df = df.loc[(df!=0).any(axis=1)]
+    df.fillna(method='bfill',axis=0,inplace=True)
+    df.fillna(method='ffill',axis=0,inplace=True)
     lat = df['lat']
     lon = df['lon']
     if lat.empty or lon.empty:
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 8148d40c..3020084e 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -176,13 +176,13 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
-TIME_ZONE = 'UTC'
 
 USE_I18N = True
 
 USE_L10N = True
 
 USE_TZ = True
+TIME_ZONE = 'UTC'
 
 TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')