[FIX] Memory fix