Revert 2 issue#2