fix bug ver1.1