Storage: Fixed ArrayList reference bug