Use short (8/47)

Use short