make use of configuration options if not used already, update #1418