try to unbreak stuff