Fixed.. the order of components