Pre Delivery fix