Fixed crate indexing