Fixed ArrayList issue with storing