fixed_issue_#7