Fixed the cyclic depends