Hotfix - 0.74.2 (@Experimental Branch)

Just a small hotfix to solve a bug related to upgrades after some of the refactoring