fix delete bug
merge with master