fix for log and shipping logic