refs #1575 fix bug
Merge branch 'akouryy_ja'