handle odd cases with zero length sequences
Merge remote-tracking branch 'upstream/master'