Intergrate small patch for config dialog from Stephan