Fixed annoying list corruption that sometimes occurred