Captured submission indexes fix