Fixing issue in list
Making sure we aren't exposing corrupted data out.