memory issue fixes
memory issues