fix set and always revert changes