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

This reverts commit a7ed128a2959bbca6fd8fbd4b82a8a19c00cb2b4.