bug fix for dropping segments in master
4 files changed