fix issue with waiting for a removed topology to be correctly removed