Fixed some weird revert issue