refs #489, #519