Revert "Fixed null Pointer error on cycle"

This reverts commit 658b5f3ff98886b055fc349933b9edc597b63788.