refs #1560 Maybe fix bug