Clean PR #655