Self-alignment procedure improvement