fix 0319
Merge branch 'fix_0319'