memory fix...again