Reload data instead of reload section to avoid crash
Merge branch 'hotfix/0.6.1'