tried to fix the return button bug but failed