Fix bug with component loading order