Fix issue #2 - merge broke the config.