Resolve #64 back/forward button friendly