fix ordering from #3540
Merge pull request #3541 from ros/fix_3540

fix ordering from #3540