Bug fixed after merged