Error correction in release1 branch