Fix a bug that's causing Update save failure