To fix a eliminate bugs

To fix a eliminate bugs