Fix content ordering (was skipping positions)