Revert "Revert "Corrected Cyclical Error""

This reverts commit afc61f2b5ab0015a667a91b2a6225e76b921d2f6.