Use short (40/47)

Use short