fixed back-button issues