Fix (apparent) ordering of stub data