[BUGFIX] Remove zero based indexed array access

This fixes unexpected results when using shortcuts in some cases