Fix cycle dependency