refs #1499 #1500 maybe fix bug