-Maybe fixed memory issue