Perfomance Issue fixed