Correctly replaces self now