fix forking when blocks are added in different order