Fixing Cycle Issue