More fixing of case
Patchless fix for case problem