Fix ordering component with cycle