refs #678, address CR comment