fixed bugs : 3651549,3650461,3652205,3652163,3652148