Attempt to solve memory issue