Manually Implement of PR #3