Issue #45: Upgrade from < 0.4.0b1 not working correctly