fixup! Add index out of bounds message