revert these 2 files because it cause bugs, waiting for a new method to deal with this condition
...