Fix regression from #157 being merged after #156