Fix short variable length