Performance issue fixed