Add adhoc config, commit comment about potential bug