Fix cycle dep