return button behavior fixed