Fix regression caused by #58