Fixed issue when user goes back