fix return button bug