Fix casing phase 1
Fix casing phase 2