Fix regression caused by #86