Make short (31/32)

Make short