Ensure we're backwards compatible for 2.5