Fix day logic