Fixed issue on Back Button