Fixed back button issue