issue_471

Please check this PR. Thanks.