Fix this, break something else