Updated it for a more cross-version compatible change