memory issue fixed
memory issue fixed