Fixed iss#4