Casing fix take 3
Casing fix, hopefully last act