Cake fix attempt #2