Small change along with other recent component load order change to keep load order consistent