Another fix for case. How the hell did this ever work?