Resolved issue_18