Fixed back button passing data