Fix alignment guessing