fixed component ordering bug