new wrapper to unbreak things again