Bug fixed and maintain