another hack at case fixes