modify two obvious bug