Adjust to changes from #133