wait until updates are completed before adding and removing. Fixes #440