StartEndDate bugfix