Fix #issue_1