Adapt to our usage