bug fix
bug fix.
Merge branch 'master' into fake-popup
Fix deletion bug.