Alignment checking improved