Slight fix for short-circuit indexing