Fix update bug for 2.3.5