Fix for removing objects that have just been added