Fix the type the return button twice issue.