fix #4682

Fix the immediate problem from #4682.