Fix delivery selection