Yury/empty start date bug fix

I already made a similar to change like this on master. You can remove this from the PR, and rebase your work onto the lastest change on master.