Performance issue fix