While you’re down there, deal with this too