Break a few eggs

Completely untested because my life is a mess, but you can see the logic that went into this, right? Fixes that damn eggbox crash once and for all.