Realignment after 08727c6 by gjb2048