refs #2669 - fixed issues