Another realign and fixed warning