Added issue_047