Functionality from #128 no longer results in an out-of-bounds error here