resolve iss#1