refs #191, #188