Bug fix in config handling