Fixes crash from #21