Fixes #133
Adjust to changes from #133