fix bugs
revert