Fix the normal behaviour for back button
Implementation is over