Fixed "back" button issue