fix_issue_18