Fixing bug when no date