Fixed cast from Short to Integer.