Fix alignment for fall back case