Back button should work properly now...
old merge fix