resolve iss#2