Temp fix for uppercase bug