Corrected output index type