Performance issue resolved