fixed problem where information from previous updates was leaking into subsequent updates patch from Shawn Green, slightly modified