Bug fixes
Merge branch 'Bug-fix'
Bug fix symbol
Merge branch 'bug-fix'