Application of PR #4181