Fix general config not to be modified by comment config in files (fixes #806)