fixed freeze issue. Changed delegation to new object.