refs #531, #521