Fixed the case when day is none