Fixed reordering of components