Fixes memory issue
Fixes memory issue