refs #234, #235