fixed_issue_#3