Fized bug with navigate on history