Trying to fix performance issue