Works with harden but breaks compatibility with master