fixed issues of last commit (ifdef and wrong conf file)