Fix dependency cylce