refs #601 fix up