#205, small configuration refinement.