Alignment bug fix