Fix integer based indexing