Fixed issues#3232,3231,2121