Avoid breaking things in the future