Applied Paul's latest patch of configuration&id from his branch