Additional controls in config file to fix #2