issue_503

Please check this PR. Thanks.