fix no shared history once and for all?