Fix bug with start date being overriden