Fix and revert