Fix regression caused by #680