Very slightly alter the API