Added fault tolerance to alignment.