fix live issue and simplify logic
4.3.1