Changed bug with dates