More for #388, controls in a directory.