Fix topology loop restore