Fix 2.2.0 post (vi)