JAL-2556 start to account for wrapped alignments