Fixing short array usage