Changed from short to int. Otherwise too small