Fix cycle issue