refs #1572 fix bug
Merge branch 'akouryy_ja'