Added more quotes and removed internal variable from config file.