Added workaround for non-overlapping peaks