Temporarily remove circular logic