Revert "Revert "Revert "Corrected Cyclical Error"""

This reverts commit 9e80470b80660ac2fa3a881136b51a2830bb484c.