fix dropbox thread issue
fix after code review