This fix is backwards compatible?