Fixed ordering / restart of default config