Fixes #1078 - add offset support to @index

For #1078