BUG Fix undefined index ID
Merge pull request #2621 from tractorcow/pulls/3.1-undefined-index

BUG Fix undefined index ID