Revert & Fix