Bug 65009: Fix incorrect index for 1-based pictures Adjusted somewhat from Github PR #211 Closes #211