Fix issue_19