Fix day of week logic