Change u_short as well.