Fixing circular ref.