Fixed click and saving issue.