Refs #2275: fix bugs from comment 8