Fix issue with configurator stopping in the middle