Fixed reordering for #319