fixed headpin cli failures