Fix cycle creation