Fix delivery_mode. Change default delivery_mode to 1