bug done.
Merge branch 'bug_613' into staging