Fix #360 - Remove at_i in favor of extract