refs #1567 fix bug
Merge branch 'akouryy_ja'