Changes:
- Resolves potentials memory problems