Fix Upgrading from review by Ben Shum.