Fix: starting date was not correctly calculated