Fix the issue#1 about save button not working properly.