This way it's also backwards compatible