Fix for browser history