refs #1560 maybe fix bug...