[Application] fix bug TDIS-6431.
Merge pull request #246 from xuzhang/dev

[Application] fix bug TDIS-6431.