Fixes upgrade failing hard