Tried to solve memory complaints.