Fixed memory issue
Fixed memory issues