diff --git a/python/fbprophet/forecaster.py b/python/fbprophet/forecaster.py
index 905aff3..7ea887e 100644
--- a/python/fbprophet/forecaster.py
+++ b/python/fbprophet/forecaster.py
@@ -262,8 +262,8 @@ class Prophet(object):
                     raise ValueError('Found non-boolean in column ' + condition_name)
                 df[condition_name] = df[condition_name].astype('bool')
 
+        df = df.reset_index(drop=True)
         df = df.sort_values('ds')
-        df.reset_index(inplace=True, drop=True)
 
         self.initialize_scales(initialize_scales, df)
 
diff --git a/python/fbprophet/tests/test_prophet.py b/python/fbprophet/tests/test_prophet.py
index 3f9415c..ad3cae0 100644
--- a/python/fbprophet/tests/test_prophet.py
+++ b/python/fbprophet/tests/test_prophet.py
@@ -102,6 +102,14 @@ class TestProphet(TestCase):
 
         self.assertTrue('y_scaled' in history)
         self.assertEqual(history['y_scaled'].max(), 1.0)
+    
+    def test_setup_dataframe_ds_column(self):
+        "Test case where 'ds' exists as an index name and column"
+        df = DATA.copy()
+        df.index = df.loc[:, 'ds']
+        m = Prophet()
+        m.fit(df)
+
 
     def test_logistic_floor(self):
         m = Prophet(growth='logistic')