Fixed zero issue with dates