fixed conf, broken after restructure