Fix property upgrade problem