fixed minor error
merged from origin