Added issue_018