Fixed a bug.  Refs #7001.
Improved consistency between 2 algorithms.  Refs #7001.