[Fixing memoru problem]