Make sure we are backwards compatible.