Found and fixed bug from the upgrade process in aa99945d9ea10ca2f37361f601ad41b3358ae2e5