fixed go back issue