refs #333, #2157