I don't usually advocate for hotfixes but...