Fix regression caused by #1402