Fixing memory issue
Fixing memory issue