Fix 2.0 encounter index bug, ticket 37