Fix FREEZE_TOPOLOGY timing