Fixed crash when switching between tabs
Merge remote-tracking branch 'origin/master'
Fixed crash when switching between tabs