master: tidied up the config issue