fixed iss#1