bug fix on back button