Adapted to change in Int.align