Fixed 8.3 lower/upper case issue