Fix regression caused by e029e84