fixed bug with locations not updating during add/remove