History Router Fix