again try to fix performance issue