After PR #1490
