merged fixed [Bug fixed]