Fix

Still not memory efficient