Fix 2 of release 2.0.2