fix the bug
Merge branch 'DA-356' into unstable

* DA-356:
  fix the bug