Fix end alignment