Fix for issue #951 where errors on remove and insert in refreshed lists