Waybill_OnWrite fixed